diff --git a/_bashbrew-cat b/_bashbrew-cat
index ae47729..dd4b5a8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -21,7 +21,7 @@ Architectures: amd64, arm64v8
 GitCommit: 0038f1c3a11aa0fc573d698b39ab5c204aad5a40
 Directory: ros/jazzy/ubuntu/noble/perception
 
-Tags: jazzy-ros-base, jazzy-ros-base-noble, jazzy, latest
+Tags: jazzy-ros-base, jazzy-ros-base-noble, jazzy
 Architectures: amd64, arm64v8
 GitCommit: 0038f1c3a11aa0fc573d698b39ab5c204aad5a40
 Directory: ros/jazzy/ubuntu/noble/ros-base
@@ -51,14 +51,14 @@ Architectures: amd64, arm64v8
 GitCommit: 0d65786f3d9bb10d55dc28ccd5b87da204240d1a
 Directory: ros/lyrical/ubuntu/resolute/perception
 
-Tags: lyrical-ros-base, lyrical-ros-base-resolute, lyrical
+Tags: lyrical-ros-base, lyrical-ros-base-resolute, lyrical, latest
 Architectures: amd64, arm64v8
 GitCommit: 0d65786f3d9bb10d55dc28ccd5b87da204240d1a
 Directory: ros/lyrical/ubuntu/resolute/ros-base
 
 Tags: lyrical-ros-core, lyrical-ros-core-resolute
 Architectures: amd64, arm64v8
-GitCommit: 0d65786f3d9bb10d55dc28ccd5b87da204240d1a
+GitCommit: 54c9478ffafa47e2e65a90a20ebd5412009a35b0
 Directory: ros/lyrical/ubuntu/resolute/ros-core
 
 Tags: rolling-perception, rolling-perception-noble
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 8bd8a38..be558e7 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,15 +1,15 @@
 ros:humble-ros-core-jammy
 ros:jazzy-ros-core-noble
 ros:kilted-ros-core-noble
-ros:latest
 ros:lyrical-ros-core-resolute
 ros:rolling-ros-core-noble
 ros:humble
 ros:humble-perception-jammy
+ros:jazzy
 ros:jazzy-perception-noble
 ros:kilted
 ros:kilted-perception-noble
-ros:lyrical
+ros:latest
 ros:lyrical-perception-resolute
 ros:rolling
 ros:rolling-perception-noble
diff --git a/ros_latest/Dockerfile b/ros_jazzy/Dockerfile
similarity index 100%
copy from ros_latest/Dockerfile
copy to ros_jazzy/Dockerfile
diff --git a/ros_latest/Dockerfile b/ros_latest/Dockerfile
index fc318b5..aa820db 100644
--- a/ros_latest/Dockerfile
+++ b/ros_latest/Dockerfile
@@ -1,6 +1,6 @@
 # This is an auto generated Dockerfile for ros:ros-base
 # generated from docker_images_ros2/create_ros_image.Dockerfile.em
-FROM ros:jazzy-ros-core-noble
+FROM ros:lyrical-ros-core-resolute
 
 # install bootstrap tools
 RUN apt-get update && apt-get install --no-install-recommends -y \
@@ -26,6 +26,6 @@ RUN colcon mixin add default \
 
 # install ros2 packages
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    ros-jazzy-ros-base=0.11.0-1* \
+    ros-lyrical-ros-base=0.13.0-3* \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/ros_lyrical-ros-core-resolute/Dockerfile b/ros_lyrical-ros-core-resolute/Dockerfile
index 960f280..b9717df 100644
--- a/ros_lyrical-ros-core-resolute/Dockerfile
+++ b/ros_lyrical-ros-core-resolute/Dockerfile
@@ -19,11 +19,11 @@ RUN apt-get update && apt-get install -q -y --no-install-recommends \
 
 
 # Setup ROS Apt sources
-RUN curl -L -s -o /tmp/ros2-testing-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-testing-apt-source_1.2.0.resolute_all.deb \
-    && echo "da9261ca7c06244da1528e0ede44018f7bb2e24a8a077eb0202f70706b578546 /tmp/ros2-testing-apt-source.deb" | sha256sum --strict --check \
+RUN curl -L -s -f -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/1.2.0/ros2-apt-source_1.2.0.resolute_all.deb \
+    && echo "a275b9b819874e745a928e83e39c429fa4d607159285c4ef3ebcf75afa732ee3 */tmp/ros2-apt-source.deb" | sha256sum --strict --check \
     && apt-get update \
-    && apt-get install /tmp/ros2-testing-apt-source.deb \
-    && rm -f /tmp/ros2-testing-apt-source.deb \
+    && apt-get install /tmp/ros2-apt-source.deb \
+    && rm -f /tmp/ros2-apt-source.deb \
     && rm -rf /var/lib/apt/lists/*
 
 # setup environment
diff --git a/ros_lyrical/Dockerfile b/ros_lyrical/Dockerfile
deleted file mode 100644
index aa820db..0000000